Merge commit 'EMACS_22_1' into deb/emacs22/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Sat, 2 Jun 2007 11:11:50 +0000 (06:11 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 2 Jun 2007 11:11:50 +0000 (06:11 -0500)

Trivial merge